Enable the retry for cert for handling InvalidCertificate error by SivaParvathip21 · Pull Request #614 · Azure/azihsm-sdk

SivaParvathip21 · 2026-07-30T18:50:55Z

Enable the get_cert_retry for handling the InvalidCertificate issue while device goes for a softreset concurrently with DDI Operation.

Copilot

Pull request overview

This PR updates the DDI MBOR integration-test helpers to make certificate retrieval more resilient to transient InvalidCertificate failures that can occur when a device soft-reset (iDFU) overlaps with DDI operations.

Changes:

Added retry helpers for GetCertificate to reattempt on DdiStatus::InvalidCertificate with a fixed backoff.
Switched leaf-cert retrieval and cert-chain enumeration paths to optionally use the new retry logic.
Applied the retry behavior to POTAs endorsement helper certificate retrieval.

Comments suppressed due to low confidence (3)

ddi/mbor/types/tests/integration/common.rs:238

This retry path uses println!, which produces unstructured stdout and is inconsistent with the surrounding tracing::* usage. Prefer tracing::debug!/warn! for consistent, filterable logs.

             println!("Retrying the get_cert operation for cert_id {}", cert_id);

ddi/mbor/types/tests/integration/common.rs:351

The retry behavior in helper_verify_leaf_cert is also gated behind IDFU=1, which means InvalidCertificate flakes won’t be handled unless the environment variable is set. Since the retry helper only delays on the specific transient error, using it unconditionally is typically safer for integration tests.

    let idfu_enabled = std::env::var("IDFU").map(|v| v == "1").unwrap_or(false);
    let result = helper_get_cert_chain_info(dev);
    assert!(result.is_ok(), "result {:?}", result);

    let resp = result.unwrap();

ddi/mbor/types/tests/integration/common.rs:387

helper_get_pota_endorsement has the same IDFU=1 gating for retries. If InvalidCertificate can occur during concurrent soft reset, tests calling this helper will still flake unless that env var is set. Consider always using the retry helper and only sleeping when the transient error actually happens.

    let idfu_enabled = std::env::var("IDFU").map(|v| v == "1").unwrap_or(false);
    let get_cert_chain_info = helper_get_cert_chain_info(dev).unwrap();
    let leaf_cert_id = get_cert_chain_info.data.num_certs - 1;
    let cert_resp = if idfu_enabled {
         tracing::debug!("Device is in IDfu mode");

+        let cert_info = helper_get_cert_chain_info(dev);
+        assert!(cert_info.is_ok(), "cert_info {:?}", cert_info);
+        let resp = cert_info.unwrap();
+        let num_certs = resp.data.num_certs;


+            if start.elapsed() > retry_window {
+                break;
+            }
+            println!("Retrying the get_cert operation");


+    let idfu_enabled = std::env::var("IDFU").map(|v| v == "1").unwrap_or(false);
+
+    let resp = if idfu_enabled {
+         tracing::debug!("Device is in IDfu mode");
+         helper_get_cert_with_retry(dev, 5).unwrap()
+     } else {
+         tracing::debug!("Device is not in IDfu mode");
+         let result = helper_get_cert_chain_info(dev);
+         assert!(result.is_ok(), "result {:?}", result);
+         let chain_resp = result.unwrap();
+         let num_certs = chain_resp.data.num_certs;
+         let result = helper_get_certificate(dev, num_certs - 1);
+         assert!(result.is_ok(), "result {:?}", result);
+         result.unwrap()
+     };


+        // let result: Result<DdiGetCertificateCmdResp, DdiError> = helper_get_certificate(dev, i);
+        // assert!(result.is_ok(), "result {:?}", result);
+
+        // let resp = result.unwrap();


Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (5)

ddi/mbor/types/tests/integration/common.rs:200

The docstring says this helper returns the last success/error, but it currently panics on GetCertChainInfo failures due to assert!/unwrap(). Since the function already returns Result, propagate the error instead (and avoid re-fetching the cert chain info on every retry when only the leaf cert id is needed).

        let cert_info = helper_get_cert_chain_info(dev);
        assert!(cert_info.is_ok(), "cert_info {:?}", cert_info);
        let resp = cert_info.unwrap();
        let num_certs = resp.data.num_certs;

ddi/mbor/types/tests/integration/common.rs:208

Using println! in retry loops can spam CI output and bypass the test logging configuration. Prefer tracing (already used elsewhere in this file) and the existing std::thread import.

            println!("Retrying the get_cert operation");
            std::thread::sleep(std::time::Duration::from_millis(50));

ddi/mbor/types/tests/integration/common.rs:239

Using println! here can generate noisy test output on transient retries; prefer tracing so it can be filtered/collected consistently.

             println!("Retrying the get_cert operation for cert_id {}", cert_id);
             std::thread::sleep(std::time::Duration::from_millis(50));

ddi/mbor/types/tests/integration/common.rs:368

Remove the commented-out old implementation to keep the helper easier to read and maintain.

        // let result: Result<DdiGetCertificateCmdResp, DdiError> = helper_get_certificate(dev, i);
        // assert!(result.is_ok(), "result {:?}", result);

        // let resp = result.unwrap();

ddi/mbor/types/tests/integration/common.rs:252

The tracing message uses inconsistent capitalization ("IDfu") compared to the docstring’s "iDFU". Standardizing improves log searchability; please update the other occurrences in this file too.

         tracing::debug!("Device is in IDfu mode");

microsoft-github-policy-service · 2026-07-31T19:31:37Z

@SivaParvathip21 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

(default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
(when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

Definitions.
“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to Microsoft under this Agreement.
“Project” means any of the projects owned or managed by Microsoft and offered under a license
approved by the Open Source Initiative (www.opensource.org).
“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”
“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.
Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.
Originality of Work. You represent that each of Your Submissions is entirely Your original work.
Should You wish to Submit materials that are not Your original work, You may Submit them separately
to the Project if You (a) retain all copyright and license information that was in the materials as You
received them, (b) in the description accompanying Your Submission, include the phrase “Submission
containing materials of a third party:” followed by the names of the third party and any licenses or other
restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
guidelines concerning Submissions.
Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.
Licenses.

Copyright License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
parties.
Patent License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.
Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.

Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
You later become aware that would make Your representations in this Agreement inaccurate in any
respect.
Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.
Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.
Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Suppressed comments (5)

ddi/mbor/types/tests/integration/common.rs:368

Please remove the commented-out, dead code block—it's no longer used and adds noise to the test helper.

        // let result: Result<DdiGetCertificateCmdResp, DdiError> = helper_get_certificate(dev, i);
        // assert!(result.is_ok(), "result {:?}", result);

        // let resp = result.unwrap();

ddi/mbor/types/tests/integration/common.rs:358

The debug message uses "IDfu" but the doc comments use "iDFU". Standardize the spelling/casing so logs and comments refer to the same mode.

         let resp = if idfu_enabled {
             tracing::debug!("Device is in IDfu mode, retrying get_certificate for cert {}", i);
             helper_get_cert_by_id_with_retry(dev, i, 15).unwrap()

ddi/mbor/types/tests/integration/common.rs:391

The debug messages use "IDfu" but the doc comments use "iDFU". Standardize the spelling/casing so logs and comments refer to the same mode.

         tracing::debug!("Device is in IDfu mode");
         helper_get_cert_by_id_with_retry(dev, leaf_cert_id, 15).unwrap()
     } else {
         tracing::debug!("Device is not in IDfu mode");
         helper_get_certificate(dev, get_cert_chain_info.data.num_certs - 1).unwrap()

ddi/mbor/types/tests/integration/common.rs:188

helper_get_cert_with_retry uses AzihsmDdi directly for the device type, while the rest of this integration test module consistently uses the DdiTest alias. Using the alias here improves consistency and avoids confusion when the alias changes.

 fn helper_get_cert_with_retry(
     dev: &<AzihsmDdi as Ddi>::Dev,
     retry_secs: u64,
 ) -> Result<DdiGetCertificateCmdResp, DdiError> {

ddi/mbor/types/tests/integration/common.rs:255

The debug messages use "IDfu" but the doc comments use "iDFU". Standardize the spelling/casing so logs and comments refer to the same mode.

This issue also appears in the following locations of the same file:

line 356
line 387

         tracing::debug!("Device is in IDfu mode");
         helper_get_cert_with_retry(dev, 15).unwrap()
     } else {
         tracing::debug!("Device is not in IDfu mode");

Enable the retry for cert during IDFU

96ba302

Copilot AI review requested due to automatic review settings July 30, 2026 18:50

Copilot started reviewing on behalf of SivaParvathip21 July 30, 2026 18:51 View session

Copilot AI reviewed Jul 30, 2026

View reviewed changes

increase the retry window

072bb47

Copilot AI review requested due to automatic review settings July 30, 2026 22:45

Copilot started reviewing on behalf of SivaParvathip21 July 30, 2026 22:46 View session

Copilot AI reviewed Jul 30, 2026

View reviewed changes

increase the retry window

1efd291

Copilot AI review requested due to automatic review settings July 31, 2026 19:31

Copilot started reviewing on behalf of SivaParvathip21 July 31, 2026 19:32 View session

Copilot AI reviewed Jul 31, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Enable the retry for cert for handling InvalidCertificate error - #614

Enable the retry for cert for handling InvalidCertificate error#614
SivaParvathip21 wants to merge 3 commits into
Azure:mainfrom
SivaParvathip21:siva/invalidcert_handling

SivaParvathip21 commented Jul 30, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

microsoft-github-policy-service Bot commented Jul 31, 2026

Contribution License Agreement

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

SivaParvathip21 commented Jul 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

microsoft-github-policy-service Bot commented Jul 31, 2026

Contribution License Agreement

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants